Merge "Add METADATA for libmtp" am: b23e73eaa0 am: 9b8a742210 am: 13549a555e Change-Id: I475cb34d0db8542fefeb552feaa81540074f2aaa